Closes #1130
Is this PR relevant anymore @thunderbirdtr @darknao?
Yes, but need rebase
rebased onto 61e76151e68727cd2434b4afc2892f35e995a7a9
Pull-Request has been merged by darknao
Closes #1130