PRIORITY - Remerge missing pulls #485 #590 #528 #574 #563 #529 

#485 #590 #528 #574 #563 #529