merged pull from salman-blue